Remove stray conflicty markar that the VCS somehow ignored.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a02fd5cdb0ab2b480e0d186e90a91489a0f6ed8..e75215de128b31c8d0e26163e81c92794492e402 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
 
        * vc/vc-git.el (vc-git-print-log): Add --follow option to command,